From bdcaff3dc1dcecd85e316e8ee4766b9a08f00f3b Mon Sep 17 00:00:00 2001 From: Daniel Bulant Date: Tue, 14 Jan 2025 18:27:17 +0100 Subject: [PATCH] small updates --- .config/waybar/style.css | 2 +- configuration.nix | 22 +++++++++++++++++++ flake.lock | 46 ++++++++++++++++++++-------------------- home.nix | 14 ++++++++++++ 4 files changed, 60 insertions(+), 24 deletions(-) diff --git a/.config/waybar/style.css b/.config/waybar/style.css index 6c118b2..d6dda79 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -1,7 +1,7 @@ * { border: none; border-radius: 0px; - font-family: "Iosevka NF"; /* "Fire Code Retina"; "JetBrainsMono Nerd Font";*/ + font-family: /*"Iosevka NF"; */ "Fire Code Retina";/* "JetBrainsMono Nerd Font";*/ font-weight: bold; font-size: 13px; min-height: 10px; diff --git a/configuration.nix b/configuration.nix index 3f2fdff..b0968de 100644 --- a/configuration.nix +++ b/configuration.nix @@ -162,6 +162,9 @@ # package = unstable-pkgs.hyprland; }; # End comment out + + #xdg.configFile."menus/applications.menu".text = builtins.readFile ./applications.menu; + environment.etc."/xdg/menus/plasma-applications.menu".text = builtins.readFile "${pkgs.kdePackages.plasma-workspace}/etc/xdg/menus/plasma-applications.menu"; # programs.hyprland.enable = true; programs.hyprlock.enable = true; @@ -216,6 +219,7 @@ kernelParams = [ # attempt to fix nvidia perf "nvidia_drm.fbdev=1" "nvidia_drm.modeset=1" "module_blacklist=i915" + "initcall_blacklist=sysfb_init" "quiet" "splash" "boot.shell_on_fail" @@ -242,6 +246,15 @@ }; boot.loader.timeout = 0; + # App image support + boot.binfmt.registrations.appimage = { + wrapInterpreterInShell = false; + interpreter = "${pkgs.appimage-run}/bin/appimage-run"; + recognitionType = "magic"; + offset = 0; + mask = ''\xff\xff\xff\xff\x00\x00\x00\x00\xff\xff\xff''; + magicOrExtension = ''\x7fELF....AI\x02''; + }; environment.systemPackages = with pkgs; [ git @@ -285,6 +298,8 @@ # Open ports in the firewall. networking.firewall.allowedTCPPorts = [ 57621 # Spotify app discovery + 42000 + 42001 ]; networking.firewall.allowedUDPPorts = [ 5353 # Google cast discovery @@ -322,6 +337,13 @@ SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", TAG+="uaccess" ''; + services.syncthing = { + enable = true; + openDefaultPorts = true; + }; + systemd.services.syncthing.environment.STNODEFAULTFOLDER = "true"; + + # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave diff --git a/flake.lock b/flake.lock index 341c79d..fda3fa9 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1735774679, + "narHash": "sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq+raipRI=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "f2f7418ce0ab4a5309a4596161d154cfc877af66", "type": "github" }, "original": { @@ -296,11 +296,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1735868406, - "narHash": "sha256-/CGzY7MUnhmw+I9j8ApwDt7qOKixWif2khwXEIR97Bc=", + "lastModified": 1736041337, + "narHash": "sha256-ImIZdS70uEHLC1NxRfc0bTVhUSBZjDNyaLlUAiloL8g=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "afc74611082ecc4a961e4317fa2763c8812e217f", + "rev": "118be90db8e4b06e3829b7b6ea901b610e870040", "type": "github" }, "original": { @@ -316,11 +316,11 @@ ] }, "locked": { - "lastModified": 1735443188, - "narHash": "sha256-AydPpRBh8+NOkrLylG7vTsHrGO2b5L7XkMEL5HlzcA8=", + "lastModified": 1736047960, + "narHash": "sha256-hutd85FA1jUJhhqBRRJ+u7UHO9oFGD/RVm2x5w8WjVQ=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "55ab1e1df5daf2476e6b826b69a82862dcbd7544", + "rev": "816a6ae88774ba7e74314830546c29e134e0dffb", "type": "github" }, "original": { @@ -362,14 +362,14 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1733096140, - "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", + "lastModified": 1735774519, + "narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" } }, "nixpkgs-unstable": { @@ -390,11 +390,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1735268880, - "narHash": "sha256-7QEFnKkzD13SPxs+UFR5bUFN2fRw+GlL0am72ZjNre4=", + "lastModified": 1735915915, + "narHash": "sha256-Q4HuFAvoKAIiTRZTUxJ0ZXeTC7lLfC9/dggGHNXNlCw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7cc0bff31a3a705d3ac4fdceb030a17239412210", + "rev": "a27871180d30ebee8aa6b11bf7fef8a52f024733", "type": "github" }, "original": { @@ -406,11 +406,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1735669367, - "narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=", + "lastModified": 1735922141, + "narHash": "sha256-vk0xwGZSlvZ/596yxOtsk4gxsIx2VemzdjiU8zhjgWw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9", + "rev": "d29ab98cd4a70a387b8ceea3e930b3340d41ac5a", "type": "github" }, "original": { @@ -510,11 +510,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1734207213, - "narHash": "sha256-5CZPAeKm24Y1BKnN8Md3HUViCMCs7AVghRC+05Bdlkk=", + "lastModified": 1735507919, + "narHash": "sha256-4cR4mk1660p3y8wnX0XbHSQh4KX0mbMn6/2YnALNt8o=", "ref": "refs/heads/main", - "rev": "6189d0d9fd062e89a375db20aeae1d1c009e9833", - "revCount": 869, + "rev": "59a82ea8cd284c7535bc06b8f6156abb7da96f6a", + "revCount": 874, "submodules": true, "type": "git", "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" diff --git a/home.nix b/home.nix index 72d48ba..b31b014 100644 --- a/home.nix +++ b/home.nix @@ -13,6 +13,8 @@ in packages = with pkgs; [ # acpilight + #kdePackages.plasma-workspace + rar wootility surrealdb surrealist @@ -28,9 +30,11 @@ in nix-top grc onefetch + inter fira fira-code fira-code-nerdfont + iosevka kitty nushell rofi-wayland @@ -69,6 +73,7 @@ in slurp wl-clipboard nextcloud-client + kdePackages.plasma-workspace kdePackages.partitionmanager kdePackages.filelight kdePackages.kate @@ -190,6 +195,15 @@ in hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}.hyprexpo hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}.hyprtrails ]; + fonts.fontconfig = { + enable = true; + defaultFonts = { + emoji = ["Noto Color Emoji"]; + monospace = ["Iosevka" "Iosevka NF" "FiraCode Nerd Font Mono"]; + sansSerif = ["Inter"]; + serif = ["Noto Serif"]; + }; + }; programs = { fish = { enable = true;