diff --git a/flake.lock b/flake.lock index db3abb8..965f25c 100644 --- a/flake.lock +++ b/flake.lock @@ -232,6 +232,26 @@ "type": "github" } }, + "emacs-overlay": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_2", + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1716196045, + "narHash": "sha256-WLxzdjUlIuf56IYdILyrDUtyUhRlWsiCF7xuhunErMA=", + "owner": "nix-community", + "repo": "emacs-overlay", + "rev": "96e0ae1f75b858ce26b84fb2b4bb2a0249dab918", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "emacs-overlay", + "type": "github" + } + }, "fenix": { "inputs": { "nixpkgs": [ @@ -240,11 +260,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1716099865, - "narHash": "sha256-GrNswS37mF+Jj/GNb2uNapd11sR9IWf7j9WexybunPs=", + "lastModified": 1716186410, + "narHash": "sha256-U/5eHWooIohw8uF0cQd8ZQll8gMZxb0QeaVEGrXJCgY=", "owner": "nix-community", "repo": "fenix", - "rev": "f7737feef42fa8abe70de20b9a13b845a113cfeb", + "rev": "49bf3506637ee9f30ab589104f479ec61db5924c", "type": "github" }, "original": { @@ -479,7 +499,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1710146030, @@ -515,7 +535,25 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "inputs": { + "systems": "systems_7" }, "locked": { "lastModified": 1685518550, @@ -728,8 +766,8 @@ "hyprcursor": "hyprcursor", "hyprlang": "hyprlang", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_2", - "systems": "systems_2", + "nixpkgs": "nixpkgs_3", + "systems": "systems_3", "xdph": "xdph" }, "locked": { @@ -852,7 +890,7 @@ }, "lib-aggregate": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs-lib": "nixpkgs-lib" }, "locked": { @@ -871,7 +909,7 @@ }, "neovim-flake": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nixpkgs": [ "neovim-nightly-overlay", "nixpkgs" @@ -899,7 +937,7 @@ "flake-parts": "flake-parts_2", "hercules-ci-effects": "hercules-ci-effects", "neovim-flake": "neovim-flake", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1715817852, @@ -1044,6 +1082,22 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1716061101, + "narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-wayland": { "inputs": { "flake-compat": "flake-compat_2", @@ -1052,11 +1106,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1716153350, - "narHash": "sha256-15dgt5coi3ov/tW+5e03I/2pybGF6d42tmAe1e845pc=", + "lastModified": 1716196864, + "narHash": "sha256-yNldG6R/7b5Ji1Y6aq0FBqOM+Bs2wO7fV3pe9+oJApU=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "672b88ea50752ab0238b4e73b05adbf1317dc12b", + "rev": "27b79ae5d67073135c289f0e86bd9ffcc6413ca4", "type": "github" }, "original": { @@ -1066,6 +1120,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1715961556, + "narHash": "sha256-+NpbZRCRisUHKQJZF3CT+xn14ZZQO+KjxIIanH3Pvn4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4a6b83b05df1a8bd7d99095ec4b4d271f2956b64", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1715787315, "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", @@ -1081,7 +1151,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1715774670, "narHash": "sha256-iJYnKMtLi5u6hZhJm94cRNSDG5Rz6ZzIkGbhPFtDRm0=", @@ -1097,22 +1167,6 @@ "type": "github" } }, - "nixpkgs_4": { - "locked": { - "lastModified": 1715961556, - "narHash": "sha256-+NpbZRCRisUHKQJZF3CT+xn14ZZQO+KjxIIanH3Pvn4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4a6b83b05df1a8bd7d99095ec4b4d271f2956b64", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_5": { "locked": { "lastModified": 1715037484, @@ -1131,11 +1185,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1715961556, - "narHash": "sha256-+NpbZRCRisUHKQJZF3CT+xn14ZZQO+KjxIIanH3Pvn4=", + "lastModified": 1716137900, + "narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4a6b83b05df1a8bd7d99095ec4b4d271f2956b64", + "rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1", "type": "github" }, "original": { @@ -1195,11 +1249,11 @@ }, "nur": { "locked": { - "lastModified": 1716156347, - "narHash": "sha256-odtsBkVYnhb8KbFP+zpUaZnWzlQKoIRFQp4BffstqS0=", + "lastModified": 1716192985, + "narHash": "sha256-UHUsp79I9VMXvv5HIJxyoi3OBBAE6i/N+LdaOrwcF6s=", "owner": "nix-community", "repo": "NUR", - "rev": "2117505a79a460df4568790e26ea1a0a4ba352f4", + "rev": "8af28f3dbe63e2fd0df3dec6dc4d30dff12b06b8", "type": "github" }, "original": { @@ -1214,13 +1268,17 @@ "anyrun": "anyrun", "doom-emacs-config": "doom-emacs-config", "doomemacs": "doomemacs", + "emacs-overlay": "emacs-overlay", "fenix": "fenix", "home-manager": "home-manager_2", "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", "neovim-nightly-overlay": "neovim-nightly-overlay", "nixpak": "nixpak", - "nixpkgs": "nixpkgs_4", + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], "nixpkgs-wayland": "nixpkgs-wayland", "nur": "nur", "schizofox": "schizofox", @@ -1233,11 +1291,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1716010637, - "narHash": "sha256-zfOgiUQaINIiG9fpL4hDzacM/V70cfhXF+iSASik5vQ=", + "lastModified": 1716107283, + "narHash": "sha256-NJgrwLiLGHDrCia5AeIvZUHUY7xYGVryee0/9D3Ir1I=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "6524922b1b1cfdf16d1e08785dec03f352f693a2", + "rev": "21ec8f523812b88418b2bfc64240c62b3dd967bd", "type": "github" }, "original": { @@ -1259,7 +1317,7 @@ "nixpkgs" ], "searx-randomizer": "searx-randomizer", - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1714677453, @@ -1300,7 +1358,7 @@ }, "spicetify-nix": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nixpkgs": "nixpkgs_7" }, "locked": { @@ -1382,21 +1440,6 @@ } }, "systems_2": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1411,6 +1454,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, "systems_4": { "locked": { "lastModified": 1681028828, @@ -1427,6 +1485,21 @@ } }, "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_6": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1441,7 +1514,7 @@ "type": "github" } }, - "systems_6": { + "systems_7": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", diff --git a/flake.nix b/flake.nix index 17d5285..264f43f 100644 --- a/flake.nix +++ b/flake.nix @@ -6,6 +6,7 @@ }; inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.follows = "hyprland/nixpkgs"; hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; hyprland-plugins = { @@ -29,6 +30,7 @@ url = "github:bloxx12/doom-emacs-config"; flake = false; }; + emacs-overlay.url = "github:nix-community/emacs-overlay"; anyrun = { url = "github:Kirottu/anyrun"; inputs.nixpkgs.follows = "nixpkgs"; @@ -47,10 +49,7 @@ }; }; spicetify-nix.url = "github:the-argus/spicetify-nix"; - nur = { - url = "github:nix-community/NUR"; - # inputs.nixpkgs.follows = "nixpkgs"; - }; + nur = { url = "github:nix-community/NUR"; }; agenix.url = "github:ryantm/agenix"; diff --git a/hosts/vali/mars/configuration.nix b/hosts/vali/mars/configuration.nix index be74181..c9f120f 100644 --- a/hosts/vali/mars/configuration.nix +++ b/hosts/vali/mars/configuration.nix @@ -23,7 +23,7 @@ programs.kdeconnect.enable = true; programs.dconf.enable = true; # boot.kernelModules = [ "v4l2loopback" ]; - boot.kernelPackages = pkgs.linuxPackages_latest; + boot.kernelPackages = pkgs.linuxPackages_zen; # boot.extraModulePackages = [ pkgs.linuxPackages.v4l2loopback ]; # services.picom.enable = true; services.emacs.enable = true; @@ -60,7 +60,7 @@ editors = { emacs = { enable = true; - doom.enable = true; + doom.enable = false; }; }; services = { diff --git a/hosts/vali/mars/hyprland/hyprland.nix b/hosts/vali/mars/hyprland/hyprland.nix index 890996f..dcc3c86 100644 --- a/hosts/vali/mars/hyprland/hyprland.nix +++ b/hosts/vali/mars/hyprland/hyprland.nix @@ -25,6 +25,7 @@ in { SDL_VIDEODRIVER = "wayland"; CLUTTER_BACKEND = "wayland"; GDK_BACKEND = "wayland"; + WLR_RENDERER_ALLOW_SOFTWARE = "1"; QT_QPA_PLATFORM = "wayland"; # Needed anymore? LIBSEAT_BACKEND = "logind"; @@ -121,7 +122,6 @@ in { repeat_delay = 250; tablet = { output = "HDMI-A-2"; }; }; - general = { sensitivity = 1.0; gaps_in = 4; @@ -163,7 +163,7 @@ in { }; dwindle = { no_gaps_when_only = true; }; - debug = { disable_logs = false; }; + debug.disable_logs = false; misc = { enable_swallow = true; diff --git a/modules/editors/emacs.nix b/modules/editors/emacs.nix index bf3eab4..a2f3a8f 100644 --- a/modules/editors/emacs.nix +++ b/modules/editors/emacs.nix @@ -7,6 +7,11 @@ let username = config.modules.other.system.username; repoUrl = inputs.doomemacs; configRepoUrl = inputs.doom-emacs-config; + emacs-desktop-symbol = pkgs.makeDesktopItem { + name = "emacsclient"; + desktopName = "Emacs Client"; + exec = "emacsclient -c -a emacs"; + }; in { options.modules.editors.emacs = { enable = mkEnableOption "emacs"; @@ -14,17 +19,16 @@ in { }; config = mkIf cfg.enable { - # Why is this needed? - # nixpkgs.overlays = [ inputs.emacs-overlay.overlay ]; + ## Emacs itself as an overlay + nixpkgs.overlays = [ inputs.emacs-overlay.overlay ]; environment.systemPackages = with pkgs; [ - ## Emacs itself - emacs binutils # native-comp needs 'as', provided by this # 28.2 + native-comp ((emacsPackagesFor emacsNativeComp).emacsWithPackages (epkgs: [ epkgs.vterm ])) + emacs-desktop-symbol ## Doom dependencies git (ripgrep.override { withPCRE2 = true; }) diff --git a/modules/gui/vivado.nix b/modules/gui/vivado.nix index 159c35f..d5e2515 100644 --- a/modules/gui/vivado.nix +++ b/modules/gui/vivado.nix @@ -2,16 +2,16 @@ let vivado-desktop-symbol = pkgs.makeDesktopItem { - name = "vivado-2022_2"; + name = "vivado-2019-2"; desktopName = "Vivado"; - exec = "${pkgs.nur.repos.lschuermann.vivado-2022_2}/bin/vivado"; + exec = "${pkgs.nur.repos.Nick1296.vivado-2019-2}/bin/vivado"; }; in { environment.systemPackages = with pkgs; [ # this propietary software is huge, but I need it for # university - pkgs.nur.repos.lschuermann.vivado-2022_2 + pkgs.nur.repos.Nick1296.vivado-2019-2 vivado-desktop-symbol ]; diff --git a/modules/other/xdg.nix b/modules/other/xdg.nix index 1232f27..cefe233 100644 --- a/modules/other/xdg.nix +++ b/modules/other/xdg.nix @@ -3,9 +3,9 @@ let username = config.modules.other.system.username; hmCfg = config.home-manager.users.${username}; - primary_browser = "schizofox.desktop"; + primary_browser = "firefox-schizo.desktop"; mail_client = "thunderbird.desktop"; - file_manager = "pcmanfm.desktop"; + file_manager = "nautilus.desktop"; media_player = "mpv.desktop"; image_viewer = "imv.desktop"; text_editor = "helix.desktop";