From d4fa00c5654c43546f1f965e027b394aa987c083 Mon Sep 17 00:00:00 2001 From: Kopatz <7265381+Kropatz@users.noreply.github.com> Date: Sun, 25 Feb 2024 17:49:49 +0100 Subject: [PATCH] reformat --- flake.lock | 60 ++++++++++++++++++------------------ flake.nix | 3 ++ modules/graphical/code.nix | 14 +++++++++ modules/graphical/shared.nix | 11 ------- 4 files changed, 47 insertions(+), 41 deletions(-) create mode 100644 modules/graphical/code.nix diff --git a/flake.lock b/flake.lock index 73870f6..d205bcc 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1703433843, - "narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=", + "lastModified": 1707830867, + "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=", "owner": "ryantm", "repo": "agenix", - "rev": "417caa847f9383e111d1397039c9d4337d024bf0", + "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6", "type": "github" }, "original": { @@ -24,11 +24,11 @@ "base16-schemes": { "flake": false, "locked": { - "lastModified": 1689473676, - "narHash": "sha256-L0RhUr9+W5EPWBpLcmkKpUeCEWRs/kLzVMF3Vao2ZU0=", + "lastModified": 1696158499, + "narHash": "sha256-5yIHgDTPjoX/3oDEfLSQ0eJZdFL1SaCfb9d6M0RmOTM=", "owner": "tinted-theming", "repo": "base16-schemes", - "rev": "d95123ca6377cd849cfdce92c0a24406b0c6a789", + "rev": "a9112eaae86d9dd8ee6bb9445b664fba2f94037a", "type": "github" }, "original": { @@ -80,11 +80,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -121,11 +121,11 @@ ] }, "locked": { - "lastModified": 1703367386, - "narHash": "sha256-FMbm48UGrBfOWGt8+opuS+uLBLQlRfhiYXhHNcYMS5k=", + "lastModified": 1706981411, + "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "d5824a76bc6bb93d1dce9ebbbcb09a9b6abcc224", + "rev": "652fda4ca6dafeb090943422c34ae9145787af37", "type": "github" }, "original": { @@ -141,11 +141,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1695388192, - "narHash": "sha256-2jelpE7xK+4M7jZNyWL7QYOYegQLYBDQS5bvdo8XRUQ=", + "lastModified": 1707825078, + "narHash": "sha256-hTfge2J2W+42SZ7VHXkf4kjU+qzFqPeC9k66jAUBMHk=", "owner": "misterio77", "repo": "nix-colors", - "rev": "37227f274b34a3b51649166deb94ce7fec2c6a4c", + "rev": "b01f024090d2c4fc3152cd0cf12027a7b8453ba1", "type": "github" }, "original": { @@ -174,11 +174,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1703879120, - "narHash": "sha256-oMJ5xtDswlBWxs0DT/aYKEUIhjEpGZJ9GbIxOclYP8I=", + "lastModified": 1708091350, + "narHash": "sha256-o28BJYi68qqvHipT7V2jkWxDiMS1LF9nxUsou+eFUPQ=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "22ae59fec26591ef72ce4ccb5538c42c5f090fe3", + "rev": "106d3fec43bcea19cb2e061ca02531d54b542ce3", "type": "github" }, "original": { @@ -197,11 +197,11 @@ ] }, "locked": { - "lastModified": 1703991017, - "narHash": "sha256-5wlJYAktFeHJlQt9VubO0FjaLe+96A/N3Die5Ym5Y/E=", + "lastModified": 1708331102, + "narHash": "sha256-nTOiQvmbB9HtxeTWgXdd2FH2w3cOyOIIrPUm+YtDVyY=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "c1c843e5059d942092d9bb9dc93768e5d2d79bdc", + "rev": "e6bbc01a35626b8db741bcbc0af807379d372218", "type": "github" }, "original": { @@ -228,11 +228,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1694911725, - "narHash": "sha256-8YqI+YU1DGclEjHsnrrGfqsQg3Wyga1DfTbJrN3Ud0c=", + "lastModified": 1697935651, + "narHash": "sha256-qOfWjQ2JQSQL15KLh6D7xQhx0qgZlYZTYlcEiRuAMMw=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "819180647f428a3826bfc917a54449da1e532ce0", + "rev": "e1e11fdbb01113d85c7f41cada9d2847660e3902", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1703637592, - "narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=", + "lastModified": 1708475490, + "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8", + "rev": "0e74ca98a74bc7270d28838369593635a5db3260", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1703467016, - "narHash": "sha256-/5A/dNPhbQx/Oa2d+Get174eNI3LERQ7u6WTWOlR1eQ=", + "lastModified": 1708440434, + "narHash": "sha256-XY+B9mbhL/i+Q6fP6gBQ6P76rv9rWtpjQiUJ+DGtaUg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d02d818f22c777aa4e854efc3242ec451e5d462a", + "rev": "526d051b128b82ae045a70e5ff1adf8e6dafa560", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2acdb8f..08122ec 100644 --- a/flake.nix +++ b/flake.nix @@ -110,6 +110,7 @@ ./modules/graphical/audio.nix ./modules/graphical/games.nix ./modules/graphical/ime.nix + ./modules/graphical/code.nix ./modules/graphical/shared.nix ./modules/hardware/nvidia.nix ./modules/hardware/ssd.nix @@ -153,11 +154,13 @@ ./modules/graphical/audio.nix ./modules/graphical/games.nix ./modules/graphical/ime.nix + ./modules/graphical/code.nix ./modules/graphical/shared.nix ./systems/laptop/configuration.nix ./modules/cli-tools.nix ./modules/virt-manager.nix ./modules/vmware-host.nix + ./modules/nix/ld.nix ./modules/ssh.nix ./modules/wireshark.nix #./modules/static-ip.nix diff --git a/modules/graphical/code.nix b/modules/graphical/code.nix new file mode 100644 index 0000000..455e8ae --- /dev/null +++ b/modules/graphical/code.nix @@ -0,0 +1,14 @@ +{ config, pkgs, inputs, lib, ... }: +{ + environment.systemPackages = with pkgs; [ + kate + jetbrains.idea-ultimate + insomnia + ]; + + #environment.sessionVariables = { + # DOTNET_ROOT = "${pkgs.dotnet-sdk_7}"; + #}; + + +} diff --git a/modules/graphical/shared.nix b/modules/graphical/shared.nix index 80d3ae5..78950da 100644 --- a/modules/graphical/shared.nix +++ b/modules/graphical/shared.nix @@ -43,12 +43,8 @@ in # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ - kate keepassxc - jetbrains.idea-ultimate - jetbrains.rider xfce.thunar - insomnia remmina nextcloud-client thunderbird @@ -61,7 +57,6 @@ in mangohud screenshot anki - obs-studio mpv p7zip qbittorrent @@ -70,10 +65,4 @@ in libsForQt5.kolourpaint wl-clipboard ]; - - #environment.sessionVariables = { - # DOTNET_ROOT = "${pkgs.dotnet-sdk_7}"; - #}; - - }